Use the new getter
authorMatthias Clasen <mclasen@redhat.com>
Sun, 1 May 2016 00:59:16 +0000 (20:59 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 1 May 2016 00:59:16 +0000 (20:59 -0400)
This avoids the use of generic api in the per-event code path.

gdk/gdkwindow.c

index 5db80fa97f704e3be28933104d8c457396361fbb..8e4fd851698f44462eebfbbe24a199595d78e345 100644 (file)
@@ -9559,8 +9559,6 @@ _gdk_windowing_got_event (GdkDisplay *display,
 
   if (device)
     {
-      GdkInputMode mode;
-
       if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD)
         {
           pointer_info = _gdk_display_get_pointer_info (display, device);
@@ -9572,10 +9570,9 @@ _gdk_windowing_got_event (GdkDisplay *display,
             source_device = pointer_info->last_slave;
         }
 
-      g_object_get (device, "input-mode", &mode, NULL);
       _gdk_display_device_grab_update (display, device, source_device, serial);
 
-      if (mode == GDK_MODE_DISABLED ||
+      if (gdk_device_get_input_mode (device) == GDK_MODE_DISABLED ||
           !_gdk_display_check_grab_ownership (display, device, serial))
         {
           /* Device events are blocked by another